Notification Fix